Planned removal: ~3.1